Some fixes and Updates