more changes
guss fixes - need to go into guss not be merged here