Adding gunod + cleaning up things