Some minor changes (mainly in alongside, that it's not used yet)
More aesthetic changes disc-disk