few more changes

having difficulty so taking a breather