Improved canvas and done a lot of fixes and other improvements