finished libraries and added highlighting