Fixed memory leak; Progress on Serialization