Minor tweaks to the code and deck