Fixed a couple of bugs and issues!

I forgot to commit more frequently
Update locale files with new strings