More testing

Testing og delete of code stuff.

Some bug fixes.