Improvements and switch to ' strings.