Added some fixes and corrections