other fixes and options