Bug fixes and minor changes

Fixed two bugs. Added new tests. Started merging CreepScoreApp branch
changes into main branch.