Jaws share rebased

A bunch of changes of mine that haven't been merged. There may be some other folks work in here as well.