Tweak instance variable/method
Fix instance method edge case
Fix instance method