fixed miscellaneous stuff