whutever, small fixes