Minor Fixes, Nice fields added