Map config start, minor bug fixes