fixed some kinks