add and improve samples