Several updates to sprint #3