added epiceditor images, code cleanup (still needs more), added support for Matrix