Fixed hill-rails causing hill-sign logic bugs, and fixed collisions

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>