minor fixjes