Converted a few static methods to public methods. Some logical changes.