added new obj loader (not integrated yet). Cleaned up some code.