(#14 #15) Amount Painting

Various code tweaks requested in preparation for pull request.