--fixed some issues..