Update machine features and do a general clean up for dylan