more port, more bugfixes