made bugfixes