0.5.4 fix bugs cont.