Commented some stuff, tweaked other...