One for all

Some bug fixes, maybe work, maybe not.