Fixed some things

Fixed around and removed some things causing loading issues.