updated top-level types. Also, fixed P.close