Fixed track switching bug, start on entity guidance

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