Add more snip types
Change #:extends to #:implements
Remove commented code