fixes for ells machine
demo ready
go go