Renamed Methods, Commented Interface, Removed Some Static References

Should be stable.