Big bugfix and finally working :)