Some commenting + improvements of procs