more bug fixes

and additions of dont implement network...