various additional improvements