adding plug ins and fixing bugs