fix typo
update control file locations
improve visibility of elements
convert tabs to spaces
fix indentation