Removal of some commented extra, and focus serialization for save/load