fixed save system, minor clean-ups as always