Cleaning up a little & adding more info