adjusted/bug fixing after a road test