Further speed ups

increased map saving saftey and maps load even faster