Converted some fields to anonymous
minor updates