plenty of tweaks

too tired and pressed to figure out what I did