- few bugs, deleted obsolete code, formatting