fixed bib, minor touch ups