fixed bug in serving order
clean
merged it up i think