Added form autocompletion and minor fixes