fixed Steve's suggestions for committing; fixed line length; added reset hard