Bug fixes, improved readme and lang strings