Small cleanup
some fixes

fix #408
Merge pull request #45 from PrinterLUA/master

fixes