Added create stmt, other fixes