fixes, upd. design, new methods