Add comments and some change