Clean up: removed unessecary moving average filters
re-introduced new methods
Fixing more compile errors; Bloody ubuntu one!
Haz I forgtten teh codes?
unimportant stuff