Some error handling and new buttons