Updated readme, fixed map implementation.