fixed few more types to stop warnings
just finished premap