ver0.0.1 Fix SQL statement and some