Bugfixes, added omake.