Major clean-up, graphics update