some fixes, also did boolean for field init