Fixed a few small bugs! :P