Handling extra fields better; updated read me