fixes #363 issues and sprint discipline