style fixes, debug-- and pass $ to option code