Cleanup, fix sundays