Debugging and readablity fixes.