Updating files, cleanup unused, fixed default settings