Added comments. And some fixes...