Finixhed up Settings and core functionality

All tests validate.