re-initialization bugfixes