Added string formatting
Added all the extra fields
todo added