added more fixes (serializable and.equals)