fixes according to comments