fixed some nonsense