added serialized save and load method +small fixes