Fix formatting and spelling mistakes
Add missing implementations