Black & White deck pulls added, general code clean up