fixed 2 minor bugs and have done more work on autocomplete