various small things
Merge pull request #158 from PCCMathProgramReview2014/alex-work

various small things