Settings work and cleanup

settings reads from files now