annotation, assembly and farm3 updates