build fixes
build updates
annontate fixes
Fix for #2