misc change

ready to merge now