updated doco and arguments handling