Some more updates and fine tuning