Suggested enhancements

along with some questions