add proper autocomplete; fix formatting