fixes and adjustments to waitress setup