Fixed some bugs
Pushing a file I forgot in the last commit