New Fields and some bug fixes