fixed bugs w/ preview feature