Currentt

bugfixes