Removed temp files
Fixed some location bugs