Several improvements and repair the errors

v1.0.0.3