Added some features suggested by vjdj