Added and fixed some methods and files.