Bug fixes and end point validation