pulled changes from desktop, switched to 1 iteration per pass until I've done a bit more debugging on 2 iterations per pass
Merged Kiyo's changes