s# This is a combination of 7 commits.
updated more code to use base collection api where possible; format style code