fixed deck list, cleaned up some other stuff