cleanup on the option pageshould handle edges better