added todos, fixed codesniffer issue