Added survey-suggested changes
Added account system