misc changes...probably for the better!