Add terms of service, bug fixes