Fixed wrong tabbing from last commit, fixed some methods