All these things I've fixed

Still having minor issues with comments