removed cals that are gone. adjusted some wording
Merge branch 'development'