Updates

A bunch of improvements/fixes all over the place