Mergeattempt

simple fixes