Saves, system improvements, and safety II

Saves, system improvements, and safety II