More code comments + small tweaks