Use put to initialise faster and small fix for data types