more tweaks, waiting on https://trello.com/c/dpfrNZDq & https://trello.com/c/UGnnbr3y & https://trello.com/c/exPhKN7j