Error fix, prioritize tweaks
Merge pull request #40 from DaaOtt/master

Error fix, prioritize tweaks