fixed 2 implict bugs
scroll bug fixed