Add better errors for dev
Add dev tools
Merge branches