added external lib & plugin fixes & cleanup files