Couple minor changes and comment showing where I wish I could call a function but can't