4.6 fixbugs part one

Some minor fixes and updates