Style, some comments, look and general errors fixed...