support abiquo, and some other misc tidies