Some bugfixes, some recipe