fixing code
fixing build, doks updates