fixes and additions for the upcoming 4.1.0.f update