Added entries; fixed some comments