Correct code layout, and make more functions inline
Expaned the function information scheme to handle up to 10 parameters (9 for member functions). Updated unit tests too