Github database fix and more tracking. Have to test this live.