Fixing the 2 tests that were failing on phone
More comments on public methods/properties