#93 + other misc fixes