several fixes in machinery; Updatable removed