Clean-up && Switch for LN

Fixes some build errors and cleans up some minor things :P
Switch for LN now - thanks to Mahdi!

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>