clean up
started adding highlights