change a couple more long ints
Merge pull request #37 from birarda/reorganize

change a couple more long ints