fixed some errors added some methods, adjusted depricated methods