Some bug fixes, changes to GUI for discard etc