Some updates based on recommendations in thread about adding type signatures