more clean up, with work based off amatus's designs