Some bug fixes suggestions.