Revised sippets
Fixed some issues