minor bug fixes plus improved map