[sylwester]

I've added several improvements over the last couple of days.