some additons
some bugfixes