Added New Features And Sanity Checks

Added New Features And Sanity Checks.