minor cleanup and options added to utils