Cleanup and better texture colors