Bump version and complete marshaling updates