Sprint 8

Many updates