Date Format and Try to fix Bugs