Changed option names and defaults related to alignment and subfunctions