cleanup; fixes to serialization; support Object serialization type on properties