small code modifications.