[shellyg]

much work and fixes