16-07 additionals and error fixes. still to do: grid