Strategy Pattern for make-api.js, various other small fixes.