more bug fixes, weee