Fixing and small additions