Fixed method that should not be static
Fixed several todos (undefined variables)