fixed things here and there