Comments, preview, bugfixes