Adds the remaining column types to 12

Added to twelve and cleaned up a bit