some minor fixes as I proceed with the experimental evaluation.