more clean up, working on materials