Tweaking and new stuff

Lots of changes to be done later!