Fixed the things that were not working