Fixes

Changed some names around and added a new method.