Updated comments and one minor fix

For the rest it seems to work correctly and nicely!