4/24 fix bugs.