attempt to annotate builds a bit better...