Anti-ghost system

+ some other minor things