picture change and minor confirmation fixes (the main bug remains though)