Added some fixes and features