resolved some issues mentioned by VS