~ fixed some bugs