Comments + minor fixes