Update comments and fixess