Updated to the release version and fixed some issues pointed out by
nckx on IRC.

Thanks,
Alex