Fixed preview issues, improved primer