fix
some local bugfixes