preview mode + bugfixes