Fixed small bugs - Everything should work