commented some stuff out, changed somethings