Added heuristic weight logging back in
Fixed selection bug that was showing up very clearly with heuristic usage
Merged 'develop'.