Reformatted everything
Fixed most serialization issues