UPD: various bug fixes & clean code