P4 source changes

A couple bug fixes, and some advanced options for syncing P4.