basic clean up on create security fixes 781 as well as laying groundwork for other things