fixes, working state