preview clean up, bug fixes