Fixed issues, added status code