Fixed mistakes on several methods