Updates and small changes