Fix integers and add preview hook