Andy map changes and more