More bugfixes; new opk