cleaned up stuff, added automated asset loading