Many, many enhancements (view the changed code for an idea)