Enhancement/fixes various