Lunch update, changed some stuff
Forgot to sync changes yesterday, doh...