further fixes for UK layout changes
whitespace clean up
updated test data
upped version