fixed some reported issues in ubuntu boxes@
merged hotfix branch into master