Fix warnings
Support instances
Reformat