Fixed minor details
More minor changes