Position annihilation + smallfixes.