Improved joining
Canvas
Minor changes
Cleaned up the rendering a bit
Table rendering and other things