Fixed some problems and cleaned up some things in my new Panel Options code spotted...