Modifying the front end and fixing some of the API.