FIX ::: forgot a few things in SQL script