more updates and additions to make Andi happy