Update with latest commits, expanding on loops mainly