last changes for 4/1

looks like a mess