low hanging fruit.
minor corrections after merge
fix exceptions