Updated colorNode and markNode

also fixed some imports