Various issue fixes. One commit per issue. #120 #136 #128 #138 #137

- #120 
- #136 
- #128 
- #138 
- #137