fixed mapping
Updated readme with correct configuration
Undid incorrect optimisations. TODO