acadox cleanup and fixes
just a tad more cleanup