Some fixes, add basic preview logic for new problem