tweaks and renaming
rm
complete api