Rafactorings and info

Just a working branch for changes to make it more clear etc..