Added a couple more fields, need to fix height on address label