Fixed small bugs and date