minor bug fixes/test asana link
https://app.asana.com/0/9170825546242/9472380108863