Fixed and added all methods

Noticed possible errors/fixes will email