improved commented stuff