Working on simplifying and fixing bugs in the lightcrafter code