Finish stevejobs
Sleepy and some cleanups