Few more bugs fixes and updates