Bugfixes, only output+displacement left