Fixed some bugs and added a bit more