Added names, milk and fixed some small bugs