Fixed more suggestions and hopefully corrected time being displayed