add previews, improve build