More fixing
Finally got completion working
Setup error checking
More error messages added