code fixes... strange data persistence o.O