Fixed a few logic errors, display serenity over time