some fixes
Merge pull request #141 from red-admirals-2014/nice_fixes

some fixes