skeletron (master of Grayskull) and other cleanup