really final improvements