Fixed and added several methods

More to come.