Improve data, abreviations, put in production