Made several things way better