Minor features added