fix some stuff
Merge branch 'master' of http://github.com/jrafidi/2.744-Sp14