Devel

I kinda added the changes from xten too...