- few bugs killed, code cleaning