- fixed wlc ordering issue #92 with merge
- fixed errors after merge