Add missing macros.
Fix target name.
Add extract support.
Fix macros/cd