Added: Running, Test Map, small things