fixes mechanics