Fixed bugs and added more stuff