Added a couple missing strings and cleaned up files a bit