Fixed small bugs...