bugfixes, functions
bugfixes, functions