Tally cleanups and some work getting working with gcc