updated options menu, fixed handler bug