start looking at the code again, minor adjustments