adding local settings
lots o help from mark
cleanup
updating the base settings
added some more settings