fixed a lot of date related stuff, speed up!