python 2.7 compatibility, fix some obvious errors, improve readability#8

neonknight wants to merge 2 commits intorflynn:masterrflynn/regroup:masterfrom

neonknight:masterneonknight/regroup:masterCopy head branch name to clipboard