fixed some of the issues
everything in it's right place