added more targets
merged changes
updated api