Improved the loading and saving design by a little bit.