Commented out what seems unnecessary, and added a few items.