- Some minor fixes added