few minor bugs fixed for 0.0.4