Minor cleanup + ability to change parameters  in modes