minor opts
junk removed