Cleant up, added cleaner drawing tools.