Update from club meeting plus some minor changes