Typo fix + added some set methods
merge
some fixes