- pl, some general cleanups