more updates; fine tuning