Fix drawing bee icons in the Imprinter
Simple Cleanup
Minor bugfixes