Fixed time issue; style fixes