added some nice fields and stuff