added some xman stuff
minor stylistic cleanups