orientation
fixed bugs