Updated more things as requested by Mike