Enhanced some methods and debugged others