Version 5.4

Many changes since last commit. Plan to update this app in the fall.