Cleanup + added some analysis files