hopeful fix
 more fixes...
Merge branch 'dev' into frontend