Bugfixes, working

functions still disabled