2014/12/17 fix minor bugs