fix few previous bugs, still wait for update from Louis