- code improvement and fix for various fields