fixed small typos
removed some depecrated code
Fixed another small typo
fixed some errors