Various fixes & Group by day implemented