Fixed super-embarrasing cover error
Pulled in fixes from Drago's suggestions
Fixed duplicate names and other index errors