More error checking and feedback, working on auto auto complete