updating some small things based on advice from hvr