api finalized, improved key and machine forms