Miscellaneous fixes; adding Panfu