minor changes
fixed some more stuff.
Test