more tile fixes, lots of clean up on 002-5