Upgrading another server today! Also a few little code optimizations.