merge dannyakakong's fixes for zoom level and configuration