...and fixed the bugs that came with the dec/inst problem