Fix dependenices and small Updates on API