jumbled checkin -- a bit more type stuff
rules types redone, looking good