Improved preview generation; more tests; some restructuring