Comments + Fixed references