Updated most methods, and removed uneeded or old ones.