Fixed issues with date. also removed old SR Stuff.