some more autocomplete fixes
Merge pull request #26 from ednapiranha/master

some more autocomplete fixes