#157 #212 Update comments.