more bug fixes - who the .. deleted elements from the db schema?
Merge branch 'Elch'