Patch 1

added uxpin and made some other entry cleanup/additions per request thx!