Minor changes based on my expirience.