Efficiency, map features, bug fixes, beautification