Multiple

Small changes in code.