V3 dev

Closing off some of the more important bugs