Some bug fixes, added ny state file and mappings