Cleaned up so it can be re-executed, other cleanupo

Forgot to get rid of snippet lins and stuff