Comments and some small updates