Corrected more methods and refactored some others.