Riemann solves and tfluct with optional psi and nonlinearity