Slight bug fixes, working on auto complete