rdiscount update, slightly tweaking everything