Don't merge unless description says otherwise. General bug fixes

Otherwise