Purtying stuff up

Alright the injection engine seems fixed (FILE A BUG REPORT OTHERWISE)
and I've added a comment here and there.