bounty create fixes
general cleanup