Fixed a bug and added a Time till next upgrade feature