- Changed costfunctions to be in line with trackers with respect to generics
- Removed warnings where possible