add latest fixes from trello card