fixed a bug
fixed some more bugs
update til dbmanager
merge conflicts