add missing part of fix + some missing move16's