some fine tunings