Add object inspection + fix breaks