asp enhancements

patch by @skyer9