Minor Bug Fixing + Insert Current Date and Time