fixed some issues
fixed some odd issues