Made a lot of fixes see Trello.