Add some lines and fixes #5