Started code review + some fixes (unfinished)