Brought in changes from most recent library patron app to this one.
Original code kept as backups.