Made a small bug fix in wating times and replaced all tabs with spaces (stupid eclipse)