fixing some basic usage stuff left over from mixed projects