Comments + minor tweaks