Comments + Fix