more comments, serializable, changed some internal properties