Some minor cleanup.
Initial work for supporting armatures. Not functional yet.