General enhancements

2022