Fixing some critical errors..... not all !!!!