+ more crappy bug fixes