did some documentation; naming convention changes