commented some things, made sure merge was okk