review code && fix bugs