Optimized some methods and fixed some methods.