Started adding code snippet information, cleaned up some preference stuff