some bugs here and there