Fixed issues and added more data