change option names, fix bug with notes