minor changes from felek