use correct strings, fix code, add comments