some testing
fixed some issues