fixed review changes, added more security and reliability