Added End Conditions, Text Display, Timer