Fixed marker intersection type mismatch; added comments; minor code impr...

...ovements