defects

also bug fixes