Small fixes, mostly everything should work without issue but needs to be tested more in detail now.