added columns up to 12, added new features, removed long names