More work on unfriendly features, updates to the generated tables