fixed naming bugs
fixed a collection of stupid bugs (like not returning from
wrapper functions).