Code review and stubs fixed