Fixed minor bug and minor adjustment of emission values.
Removed debugging code.