moar comments + some fixes