various pre and port unobscure bugfixes