Fix bugs, move canvas to own file, add line widths