lots of updates, added paint