edited guidelines, do I really need to comment everything...check the diffs.