bugs removed -works well now