added scrollview support,  various fixes