Swaping changes to this branch and fixing meals report