bug fixes, remove faulty plugin