Fixed various bugs introduced by my changes and added satisfaction level display