aalot  of changes/ cleanup