More updates and fine tuning