some remapping and fixes