Minor tweaks to improve usability and to add funding sources
Merging in Kaushik's changes