Changed some comments and bugs