mostly minor changes & param differencies