molesting and bug fixes