add fixes according to comments