Fix master_listen prototype
Additional cf_ functions
Formatting