Changed implicit def import, fixed sample bugs