more recent snapshot

Cleaned the code up; removing unnecessary data etc.