Revise codes based on Taberareloo v3.0.3

and some corrections