fixed more bugs
forgot check/flags
boostrap issue
rename a badly named hash map
fix conformance