options fixes, release prep