Fixed stupid issues and removed commented code