think made the changes mentioned in the last one + working
all except the special case for inflation :s ....