fixes #363 issues and sprint discipline

Working day is a relative loose term ;-) How about Friday?