More work on the Illuminator Block (almost finished) + Some code clean up