various changes

Too lazy to document.