fix first commit bugs