Fixed some bugs and created some others :(