Am I good now @codex and @jakeb1933? or is there more I can do?