Commented code, minor improvements to strategies