user friendliness fixes