Fixed some initial bugs

w00t w00t