commenting and style changes to frame.cs
merge conflicts