cleanup
fix serialization. strange issues...