More fields and some small fixes