Gradually advancing in the code, small bug fix session for today as I have been busy for the last few days, phew