Comments + minor changes