various changes, mostly because of outdated commands