fixed mapping bugs and disabled constraints for now