Fixed date bug, user bug, streamlined code