change some stuff around in prep for merge of any useful things