fixed capitalize issues