Intelliplug and minor bug fix update