lots of fixes
Merge branch 'master' of github.com:GU-2013-TEAM-M/eos