More API changes and methods

Added more API methods and tidied up execution.