Pre-lection commit 4. Fixed some more bugs... yet again...