fixes wip and preapp