Some bugs corrected, also links changed