bug fixes whee