Added bib-stuff up to 20
Fixed safety of labour ending