next batch of changes (plus some table style changes I snuck in :)