misc + big cleanup of tree maker, new args added