Update with type board definition
minor fixes