fixed comments and got working