Fixes and fixes and some more fixes
Things like time, Ieuans code.