Minor improvements
Bug solved