fixes and model

+ model without direct moves