hopefully fixed some bugs