Updated lots of snippet stuff