merged some more jon changes