Bugfixes and new opk