Hopefully fixed some bugs from last week