20141218-01-fix_a_few_bugs