fixed downcase issue and issues with edit