Complete 21, fix prototypes