standby test and fix some bugs

k. will do it.