Remove some warnings
Add fitting routines