Some slight optimizing and other stuff

Still experiencing problems with producers not showing up, searching for
the error..