fixed miscellaneous issues.