FIX/ADD: Serialization bugs galore were rounded up and shot, with some nifty add-ons