More Places

Also some minor fixes to the code and lang file.