added params, other minor changes