Removed stub / fixed methods. Small comment changes. Added main method.