Alpha 17

many improve on data grid