bug fixes. everything *should* work now