Added/updated some comments