Bugfixes to the deck and default collection generation
Improvments to collection loading

Hopefully stops or at least greatly improves the slowdown when loading
the collection.