Added more info, cleaned up a few things along the way