- fixed some issues