More APIs, disabled non-working APIs, fixed others.