tried various boundary formulations
slightly improved handling
performance testing
added h1 and h2