many bugfixes! and updating examples
fixed merge issues
fixed diff displaying in code