changed vars in controller/jsp to long names
untracked additions