minor build updates...WIP