some bugfixes, stubs