commenting + some fixes