minor bug fixes/changes