small fixes and fix renderind map