cleaned up some old code, and solved 94 and 120