Minor cleanup
Add forwarding
More uncrustify stuff