Fix typos. Add some proper method signatures