Cleaning stuff up and adding some corrections.