more little fixes. almost done?