Last updates from me :)

This is (for now) the last code change. Later on I might want to remove all the double code that's present at the moment.