fixed minor serializer bug
various additions and restructuring
some more additions