FIX: minor bug fixes, REMOVED: deprecated previews code