Added some fixes and changes