Adding plugins and squaqshing bugs