fixed a bug
fixed some more bugs
update til dbmanager
fixed a few bugs
Merge branch 'dev'