Post Sprint

Committing bug fixes