fixed miscellaneous issues