enum usage fix
removing for now, need a better test which replicates real conditions
typo fix
cleaned up init