Fixings and Map draw() implementation

refactor