fixed some formatting / brought swatches back / started canvas stuff