various changes, broke something