Changed _plotadd slightly and enums. Untested