fixed some problems in the lesser used feature sets thanks to Greg