added (mostly finished) enhancement support