Map draft + minor changes