minor changes to make and options