V3 dev

Bugfix sprint!