Fixes #28 #27 + Map bounds.