Fix something and add sample