fixed some wai stuff