V3.7- Resolved Github Issues

Resolved #200, #204
This broke before I made any changes.