More major edits, added auto complete tips