Loading update

Loading/saving + minor bugs.