Neaten code & map size is now really 400x400