renaming fields
bug fixes