added ifdef _PAX_ for pax specific defines. Cleaned up a bit.