some updates/fixes