"Final" Fixes (and bug pixs)