various fixes.
Merge branch 'design' of github.com:yogeshchaugule/lpc into design
couples switcher fix.