Updated Cupboard and tweaked various functions