Fixed Errors & Added Serialization