Updated versions to function appropriately

@scotthain being a bad ass walking me through some things I totally overlooked.