Removed warnings/comments, fixed Date/Time bug