General tweaks; ask if you have questions