moved around header, changed settings form, fixed shufffles
merge
dad
merge